merge with xen-unstable.hg

diff --cc linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
Simple merge

diff --cc linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
Simple merge

diff --cc tools/examples/xmexample.vti
index 77f55ae23e5f7737233ece0b5c07fc206dc5a413,1f01c3c04daef4c40b4f7312b25f9f4072c2bc77..3a0d8e1a3acc3b4e99d6943d3d5b5258d144c264
--- 1/tools/examples/xmexample.vti
--- 2/tools/examples/xmexample.vti
+++ b/tools/examples/xmexample.vti
@@@ -64,9 -66,18 +64,11 @@@ disk = [ 'file:/var/images/xenia64.img,
  # New stuff
  device_model = '/usr/' + arch_libdir + '/xen/bin/qemu-dm'
  
 -# Advanced users only. Don't touch if you don't know what you're doing
 -memmap = '/usr/lib/xen/boot/mem-map.sxp'
 -
 -#-----------------------------------------------------------------------------
 -# Disk image for 
 -#cdrom=
 -
  #-----------------------------------------------------------------------------
  # boot on floppy (a), hard disk (c) or CD-ROM (d) 
- #boot=[a|c|d]
+ # default: hard disk, cd-rom, floppy
+ #boot="cda"
+ 
  #-----------------------------------------------------------------------------
  #  write to temporary files instead of disk image files
  #snapshot=1

diff --cc xen/arch/ia64/vmx/mmio.c
index 5501acb74d559d31ebff015d234dab4bdd9cb52b,f67764320db50adcd11f03ba7137f960d4e75b9e..ed635a478b637dca1cdded6427976844fbff275a
--- 1/xen/arch/ia64/vmx/mmio.c
--- 2/xen/arch/ia64/vmx/mmio.c
+++ b/xen/arch/ia64/vmx/mmio.c
@@@ -31,9 -30,10 +31,9 @@@
  #include <asm/bundle.h>
  #include <asm/types.h>
  #include <public/hvm/ioreq.h>
 -#include <asm/mm.h>
  #include <asm/vmx.h>
  #include <public/event_channel.h>
- #include <public/arch-ia64.h>
+ #include <public/xen.h>
  #include <linux/event.h>
  #include <xen/domain.h>
  /*

diff --cc xen/arch/ia64/xen/domain.c
Simple merge

diff --cc xen/arch/ia64/xen/hyperprivop.S
Simple merge

diff --cc xen/arch/ia64/xen/mm.c
Simple merge

diff --cc xen/arch/ia64/xen/vcpu.c
index 7ab3197393549ff3cce43bcb925e399c94cc851c,18dfec4e1fc5323271480827ad95fc967cfd1d60..cab06b25769f4afe923077526ea361be31f16452
--- 1/xen/arch/ia64/xen/vcpu.c
--- 2/xen/arch/ia64/xen/vcpu.c
+++ b/xen/arch/ia64/xen/vcpu.c
@@@ -7,8 -7,7 +7,8 @@@
   */
  
  #include <linux/sched.h>
- #include <public/arch-ia64.h>
+ #include <public/xen.h>
 +#include <xen/mm.h>
  #include <asm/ia64_int.h>
  #include <asm/vcpu.h>
  #include <asm/regionreg.h>

diff --cc xen/arch/ia64/xen/xenasm.S
Simple merge

diff --cc xen/include/asm-ia64/config.h
index e1a49620749f2beb5290c471332007192ada35c4,4d172c527711bf9d52634b5a0c708613606e62c0..65ef3933451f158a728b7d26bd1bcfecee324168
--- 1/xen/include/asm-ia64/config.h
--- 2/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@@ -37,12 -37,8 +37,14 @@@
  
  #define MAX_DMADOM_PFN (0x7FFFFFFFUL >> PAGE_SHIFT) /* 31 addressable bits */
  
 +/* If PERFC is used, include privop maps.  */
 +#ifdef PERF_COUNTERS
 +#define CONFIG_PRIVOP_ADDRS
 +#define PRIVOP_COUNT_NADDRS 30
 +#endif
 +
+ #define CONFIG_VGA 1
+ 
  #ifndef __ASSEMBLY__
  
  // can't find where this typedef was before?!?

diff --cc xen/include/asm-ia64/domain.h
Simple merge

diff --cc xen/include/asm-ia64/privop_stat.h
index a5ea27ad82b2373fd55239044a91a58edb524dec,c3cd173fc50365e374533f16f548e770c06c7d3d..61e709b1d25590c145bcbec9421462308bf2e2d1
--- 1/xen/include/asm-ia64/privop_stat.h
--- 2/xen/include/asm-ia64/privop_stat.h
+++ b/xen/include/asm-ia64/privop_stat.h
@@@ -1,46 -1,23 +1,48 @@@
  #ifndef _XEN_UA64_PRIVOP_STAT_H
  #define _XEN_UA64_PRIVOP_STAT_H
 +#include <asm/config.h>
+ #include <xen/types.h>
+ #include <public/xen.h>
  
 -extern int dump_privop_counts_to_user(char *, int);
 -extern int zero_privop_counts_to_user(char *, int);
 +#ifdef CONFIG_PRIVOP_ADDRS
  
 -#define PRIVOP_ADDR_COUNT
 +extern void gather_privop_addrs(void);
 +extern void reset_privop_addrs(void);
  
 -#ifdef PRIVOP_ADDR_COUNT
 +#undef  PERFCOUNTER
 +#define PERFCOUNTER(var, name)
 +
 +#undef  PERFCOUNTER_CPU
 +#define PERFCOUNTER_CPU(var, name)
 +
 +#undef  PERFCOUNTER_ARRAY
 +#define PERFCOUNTER_ARRAY(var, name, size)
 +
 +#undef  PERFSTATUS
 +#define PERFSTATUS(var, name)
 +
 +#undef  PERFSTATUS_CPU
 +#define PERFSTATUS_CPU(var, name)
 +
 +#undef  PERFSTATUS_ARRAY
 +#define PERFSTATUS_ARRAY(var, name, size)
 +
 +#undef  PERFPRIVOPADDR
 +#define PERFPRIVOPADDR(name) privop_inst_##name,
 +
 +enum privop_inst {
 +#include <asm/perfc_defn.h>
 +};
 +
 +#undef PERFPRIVOPADDR
  
 -/* INST argument of PRIVOP_COUNT_ADDR.  */
 -#define _GET_IFA 0
 -#define _THASH 1
  #define       PRIVOP_COUNT_ADDR(regs,inst) privop_count_addr(regs->cr_iip,inst)
 -extern void privop_count_addr(unsigned long addr, int inst);
 +extern void privop_count_addr(unsigned long addr, enum privop_inst inst);
  
  #else
 -#define       PRIVOP_COUNT_ADDR(x,y) do {} while (0)
 +#define PRIVOP_COUNT_ADDR(x,y) do {} while (0)
 +#define gather_privop_addrs() do {} while (0)
 +#define reset_privop_addrs() do {} while (0)
  #endif
  
  #endif /* _XEN_UA64_PRIVOP_STAT_H */

diff --cc xen/include/asm-ia64/vmx_vpd.h
Simple merge